From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 16 Apr 2011 02:58:53 +0000 (-0700)
Subject: * xfns.c (USG): Use the kludged USG macro, to pacify gcc.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~4111^2~47
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=8c9bec787feb817092517c14bbb062747491900b;p=emacs.git

* xfns.c (USG): Use the kludged USG macro, to pacify gcc.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 7abeb6327e5..cd27e23e076 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,7 @@
 
 	* xfns.c (free_frame_menubar, atof): Remove duplicate decls.
 	(x_window): Rename locals to avoid shadowing.
+	(USG): Use the kludged USG macro, to pacify gcc.
 
 	* xterm.c (x_alloc_nearest_color_for_widget): Remove; unused.
 	(x_term_init): Remove local to avoid shadowing.
diff --git a/src/xfns.c b/src/xfns.c
index 3d17f22be63..1489cbf043e 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -83,6 +83,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef USG	/* ####KLUDGE for Solaris 2.2 and up */
 #include <X11/Xos.h>
 #define USG
+#ifdef USG /* Pacify gcc -Wunused-macros.  */
+#endif
 #else
 #include <X11/Xos.h>
 #endif